<<<<<<< HEAD
#include "bullet.h"

bullet::bullet(QPoint start_pos,QPoint end_pos,QString filename) : QObject(0),picture(filename)
{
    this->start_pos=start_pos;
    this->end_pos=end_pos;
    this->current_pos=start_pos;
}
void bullet::draw(QPainter *painter){
    painter->drawPixmap(current_pos,picture);
}
void bullet::move(){
    QPropertyAnimation *animintion=new QPropertyAnimation(this,"current_pos");
    animintion->setDuration(2000);
    animintion->setStartValue(start_pos);
    animintion->setEndValue(end_pos);
    animintion->start();
}

QPoint bullet::getcurrent_pos(){
    return this->current_pos;
}

void bullet::setcurrent_pos(QPoint pos){
    this->current_pos=pos;
}
=======
#include "bullet.h"

bullet::bullet(QPoint start_pos,QPoint end_pos,QString filename) : QObject(0),picture(filename)
{
    this->start_pos=start_pos;
    this->end_pos=end_pos;
    this->current_pos=start_pos;
}
void bullet::draw(QPainter *painter){
    painter->drawPixmap(current_pos,picture);
}
void bullet::move(){
    QPropertyAnimation *animintion=new QPropertyAnimation(this,"current_pos");
    animintion->setDuration(2000);
    animintion->setStartValue(start_pos);
    animintion->setEndValue(end_pos);
    animintion->start();
}

QPoint bullet::getcurrent_pos(){
    return this->current_pos;
}

void bullet::setcurrent_pos(QPoint pos){
    this->current_pos=pos;
}
>>>>>>> 199f3fb0e9bc83f97607ce663cfb658435caaa4f
